Merge pull request #1 from viastudio/master

Merging Dev to Master