Added compiling support
Added extra packages option
Removed comment
Merge branch 'develop'