Merge Develop into Master 

Release version 0.3