merger
Merge pull request #9 from Tigerryttaren/development

merger