Move CSS into separate file
Merge bugfixes branch
Version 1.5