initialisation
Merge pull request #2 from pixolovski/master

initialisation