Merge pull request #5 from seivan/master

Master to Develop