Merge pull request #24 from AbraxasCSharp/dev

Dev