dfds
Merge branch 'master' into working
Merge pull request #13 from Nordran/working

merge Nordran/Working into master