20130505 - See readme.md for changes