Version 0.3

Fixed errors
Merge remote-tracking branch 'upstream/master'