fixing package problems. and possible compilation problems.
added a couple lines
Merge pull request #45 from RAlmada/master

Fixing package problems and possible compilation errors