blah
all
Merge pull request #3 from Nordran/working

Merging Nordran/working into master