Merge pull request #6 from HavretGC/solution_clean_up

AMQNET-588  Solution clean up