Merge pull request #143 from increpare/dev

Dev
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge pull request #147 from increpare/master

pull