Commit after update #2

Merged
merged 2 commits into from Apr 28, 2015
Merged