Merge pull request #12 from theVKC/master

Merging VKC changes into master, see commits for details
Merge pull request #16 from theVKC/master

Merging Robert's changes in to main branch
Merge pull request #1 from MN-Script-Team/master

Even steven