Resolves issue #11 and fixed previous changes mentioned by Conrad for project2

~moderator @ScottBishop
requested: 280