boostrap conflict fix & code cleaning
Merge pull request #75 from benitoro/master

boostrap conflict fix & code cleaning