Bug fixes 19-11-13
Merge branch 'development'