Formatting
Added some more tests
Merge branch 'dev'
Merge remote-tracking branch 'origin/master'