Automation++ (fixes #19)

Thanks @jshawl for feedback on this one.