Change over to KostaKow's version of this
Merge branch 'development'