Fix some shit
Merge branch 'devel' of github.com:jpascale/Project-X into devel