Merge Revision 0.1.10
Merge branch 'master' into dev