Initial release based on Niklas Akerlund version