Code from dektrab
Merge pull request #1 from AiRWIPP13/BD

Code from dektrab