Merge pull request #3 from KokaKiwi/master

Improved Makefile
Add managed boxes feature to fix the build on latest master
Modified Makefile (see PR #3)