Tiddy up
Merge pull request #7 from najela/wip

Tiddy up