Merge pull request #12 from MN-Script-Team/master

Merge master to VKC for testing
Committing yesterdays Krabappel work

#Krabappel
Merge pull request #146 from theVKC/master

#Krabappel VKC merging