Merging changes from master version 0.3.3