Merge pull request #196 from jhersh/master

UIKIT_EXTERN for great justice + typos