Merge pull request #30 from aerhard/new_features

New features and modifications