first messy commit
Merge branch 'master' of github.com:Fabryz/nampg