improved performance
resolved memory leak adding dispose
added oak