Merge pull request #32 from nromanen/master

Merge
30.12
30-12 evening
1st commit 2014
2-01-14
11111
3-01-2013
Merge