refactored method names and added getters (now requires ES5)
latest build
merge conflict