merged svn and git
Merge pull request #1 from igsor/nico

merged svn and git