Merge pull request #7 from tim-yang/master

Two commits to solve exceptions
Mark.
Mark as updated.
Update RTC.