Corrected some bugs in the installation process
Some minor changes and cleaning
Merge pull request #6 from leolabs/development

Build 20130507.1