Issues #25, #26, #27, #28, #32
Merge branch 'development' of https://github.com/QuatreCentQuatre/caspian into development