Merge pull request #2 from SindreSvendby/master

getting in sync
sugestion
Merge pull request #3 from risto1913/master

Sugestion minor tweeks.