Implemented part of #82

Need to implement .Net version