Merge branch 'Development'
Minor fixes
Merge branch 'Development'
Merge branch 'master' of https://github.com/wudoict/Pnatter