Merge pull request #42 from fix8/master

Master to Dev