Just some minor changes in order to eradicate some Eclipse errors
(problems)
Merge branch 'next' of github.com:dideher/minoas into next