Not using develop install
Merge pull request #32 from globoi/master

Not using develop install