Issue 17

Resolve #17, getting ready to add travis ci :)