Version 0.7

As issue #24 resolved, these are the changes I made and are being pushed to develop instead of master.