adsf
minor changes
Merge branch 'master' of github.com:hadjichristslave/armaproj