Several updates
Merge pull request #6 from jonathankau/dev

Several updates