fix
Merge branch 'master' into working
Merge pull request #14 from Nordran/working

Working