TestCommit
TestCommit
TestCommit
Added minor bugfixes and error-handling