Some minor changes
minor #103 Some minor changes (Szymciosek)

This PR was squashed before being merged into the 1.1.x-dev branch (closes #103).

Discussion
----------

Some minor changes

Commits
-------

d6f2436 Some minor changes