Merge pull request #1 from Wieke/SimpleWaitFunctionality

Simple wait functionality
Fixed a dumb error where getEvents was checking the begin/end vs
dataArray.size().
Updated plan.
Improved the wait loop a little.