Merging the intern’s code with our master branch

master alb404 commited on 19 Jun 2015