a little bit more
Merge pull request #4 from Nordran/working

Merging Nordran/working into master