Working on #144
Closed #153
Closed #151
Closed #141
Merge pull request #156 from kordianbruck/master

Travis automated testing