Cleanup and array check #134
merge w/master