Pr 96

I have edited some of the original request submitted by @relotnek