Dev 0.3

Merging development 0.3 with the master uild.