Merge pull request #19 from iFlyCode/master

Merge for Consistency.
Merge branch 'master' into beta
Release 3.1_01
Merge branch 'beta'