Merge and testing
Merge branch 'master' of github.com:smaass/sar2014