Changed to SDK 8.1. Removed rm. reference as gem is released now. Minor tweaks