Merge pull request #48 from designmodo/master