Initial v0.4 refactorings.
More fucktorations.
Last fucktorations for 0.4.0
Fucktorations based on conversation with Martin.
Edited.
Merge pull request #6 from pekkis/0.4

0.4