fixed #2, #3, #6, #7: Version 0.3.3