Merge pull request #76 from marcoscaceres/master

Changed how the main interface is loaded + cleanup.
Merge remote-tracking branch 'upstream/master'

* upstream/master: